From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 28 Nov 2007 13:28:49 +0000 (+0000)
Subject: xsm: Fix linker script integration for xsm initcall list.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14684^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=9b08de03e85ad4b23332911cb019a0cba7832f02;p=xen.git

xsm: Fix linker script integration for xsm initcall list.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/x86_32/xen.lds.S b/xen/arch/x86/x86_32/xen.lds.S
index 08649f931b..7641867f68 100644
--- a/xen/arch/x86/x86_32/xen.lds.S
+++ b/xen/arch/x86/x86_32/xen.lds.S
@@ -63,8 +63,9 @@ SECTIONS
   __initcall_start = .;
   .initcall.init : { *(.initcall1.init) } :text
   __initcall_end = .;
-   .xsm_initcall.init : { __xsm_initcall_start = .; 
-   *(.xsm_initcall.init) __xsm_initcall_end = .; }
+  __xsm_initcall_start = .; 
+  .xsm_initcall.init : { *(.xsm_initcall.init) } :text
+  __xsm_initcall_end = .;
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
 
diff --git a/xen/arch/x86/x86_64/xen.lds.S b/xen/arch/x86/x86_64/xen.lds.S
index 4ff12a01c2..8dd5a41cb7 100644
--- a/xen/arch/x86/x86_64/xen.lds.S
+++ b/xen/arch/x86/x86_64/xen.lds.S
@@ -61,6 +61,9 @@ SECTIONS
   __initcall_start = .;
   .initcall.init : { *(.initcall1.init) } :text
   __initcall_end = .;
+  __xsm_initcall_start = .; 
+  .xsm_initcall.init : { *(.xsm_initcall.init) } :text
+  __xsm_initcall_end = .;
   . = ALIGN(PAGE_SIZE);
   __init_end = .;